projects / project / bcm63xx / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2405d09) | patch
zynq: load u-boot-dtb.img if CONFIG_OF_SEPARATE is defined
authorMasahiro Yamada <[email protected]>
Thu, 15 May 2014 11:37:52 +0000 (20:37 +0900)
committerMichal Simek <[email protected]>
Thu, 15 May 2014 11:57:28 +0000 (13:57 +0200)
commit0dfbcf02de58b2ebf8ea63f57a9971592b5b2277
treedbdbeb7ae6f0ac1a81638ef14c47cc78344434e0tree | snapshot
parent2405d09c4c8a1e4cd7744e5f10d1592bd974a939commit | diff
zynq: load u-boot-dtb.img if CONFIG_OF_SEPARATE is defined

SPL should load "u-boot-dtb.img" if both CONFIG_OF_CONTROL
and CONFIG_OF_SEPARATE are defined.
Otherwise, "u-boot.img" should be loaded.

Since CONFIG_OF_CONTROL is always undefined for SPL_BUILD,
the undef block should be moved below the conditional definition
of CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME.

Signed-off-by: Masahiro Yamada <[email protected]>
Cc: Michal Simek <[email protected]>
Signed-off-by: Michal Simek <[email protected]>
include/configs/zynq-common.h diff | blob | history
Broadcom-s U-Boot